From bf4e85d3928126822cfa521571df773950cc4e3d Mon Sep 17 00:00:00 2001 From: "vh249@arcadians.cl.cam.ac.uk" Date: Mon, 12 Sep 2005 10:54:30 +0000 Subject: [PATCH] removing XEN_LOCALVERSION for a smaller alternative Signed-off-by: Vincent Hanquez --- Makefile | 2 -- buildconfigs/mk.linux-2.6-xen | 7 +++---- buildconfigs/mk.linux-2.6-xen0 | 7 +++---- buildconfigs/mk.linux-2.6-xenU | 7 +++---- xen/Makefile | 4 +--- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index d77ddbd57f..3b50ec6436 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,6 @@ INSTALL := install INSTALL_DIR := $(INSTALL) -d -m0755 INSTALL_DATA := $(INSTALL) -m0644 INSTALL_PROG := $(INSTALL) -m0755 -XEN_LOCALVERSION:= KERNELS ?= linux-2.6-xen0 linux-2.6-xenU # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU @@ -19,7 +18,6 @@ KERNELS ?= linux-2.6-xen0 linux-2.6-xenU XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) ) export DESTDIR -export XEN_LOCALVERSION # Export target architecture overrides to Xen and Linux sub-trees. ifneq ($(XEN_TARGET_ARCH),) diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen index 02a29f0ef7..1b8a0ff1e0 100644 --- a/buildconfigs/mk.linux-2.6-xen +++ b/buildconfigs/mk.linux-2.6-xen @@ -7,7 +7,6 @@ LINUX_VER = 2.6.12 EXTRAVERSION = xen LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) -LOCALSTR = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION) include buildconfigs/Rules.mk @@ -16,10 +15,10 @@ include buildconfigs/Rules.mk # The real action starts here! build: $(LINUX_DIR)/include/linux/autoconf.h if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \ - $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \ - $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ + $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \ + $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ fi - $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install + $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref rm -rf $(LINUX_DIR) diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0 index 2dae91d6d4..3dc195eb05 100644 --- a/buildconfigs/mk.linux-2.6-xen0 +++ b/buildconfigs/mk.linux-2.6-xen0 @@ -7,7 +7,6 @@ LINUX_VER = 2.6.12 EXTRAVERSION = xen0 LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) -LOCALSTR = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION) include buildconfigs/Rules.mk @@ -16,10 +15,10 @@ include buildconfigs/Rules.mk # The real action starts here! build: $(LINUX_DIR)/include/linux/autoconf.h if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \ - $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \ - $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ + $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \ + $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ fi - $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install + $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref rm -rf $(LINUX_DIR) diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU index f0a184a0cb..c45f059f8c 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -7,7 +7,6 @@ LINUX_VER = 2.6.12 EXTRAVERSION = xenU LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) -LOCALSTR = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION) include buildconfigs/Rules.mk @@ -16,10 +15,10 @@ include buildconfigs/Rules.mk # The real action starts here! build: $(LINUX_DIR)/include/linux/autoconf.h if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \ - $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \ - $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ + $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \ + $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ fi - $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install + $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref rm -rf $(LINUX_DIR) diff --git a/xen/Makefile b/xen/Makefile index 5e0eb35ce4..58eb34a88a 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -11,8 +11,7 @@ INSTALL_DIR = $(INSTALL) -d -m0755 export XEN_VERSION = 3 export XEN_SUBVERSION = 0 export XEN_EXTRAVERSION = -devel -export XEN_LOCALVERSION = -export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)$(XEN_LOCALVERSION) +export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) export BASEDIR := $(CURDIR) @@ -33,7 +32,6 @@ build: $(TARGET).gz install: $(TARGET).gz [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz - ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_LOCALVERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz -- 2.30.2